Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 15:11:22 +0000 (08:11 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 15:11:22 +0000 (08:11 -0700)
commit11f208d78304d731d62a93d18420679e7060dd98
treed5ad31a0f1418c6484cfc356638f7bf6d840b4c9
parent1138967d54b10ef3e45112449ec052ae000cc4ac
parent253d42fe4c0878cf4e649e684e43a5e393848011
Merge from trunk.